Merge pull request #4 from lanrion/send-message

Send message

Merge pull request #4 from lanrion/send-message
Send message
lanrion
2 parents 085bd456 de47dcc6
Showing 15 changed files with 393 additions and 70 deletions Show diff stats
.gitignore
README.md
lib/qy_wechat_api.rb
lib/qy_wechat_api/api/media.rb
lib/qy_wechat_api/api/menu.rb
lib/qy_wechat_api/api/message.rb
lib/qy_wechat_api/carrierwave/qy_wechat_api_uploader.rb
lib/qy_wechat_api/client.rb
qy_wechat_api.gemspec
spec/api/media_spec.rb
spec/api/medias/favicon.ico
spec/api/medias/ruby-logo.jpg
spec/api/menu_spec.rb
spec/api/message_spec.rb
spec/spec_helper.rb
@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.DS_Store
@@ -78,4 +78,23 @@ group_client.oauth.authorize_url(&quot;http://2458023e.ngrok.com&quot;, &quot;state&quot;)
 group_client.oauth.get_user_info("code", "app_id")
 ```
+## 发送消息
+
+```ruby
+  # params: (users, parties, tags, agent_id, content, safe=0)
+  # users, parties, tags 如果是多个用户，传数组，如果是全部，则直接传 "@all"
+  group_client.message.send_text("@all", "@all", "@all", app_id, text_message)
+```
+**其他发送消息方法请查看 api/message.rb**
+
+## 上传多媒体文件
+```ruby
+# params: media, media_type
+group_client.media.upload(image_jpg_file, "image")
+
+# 获取下载链接
+# 返回一个URL，请开发者自行使用此url下载
+group_client.media.get_media_by_id(media_id)
+```
+
 # encoding: utf-8
 require "rest-client"
+
+require "carrierwave"
+require "qy_wechat_api/carrierwave/qy_wechat_api_uploader"
+
 require 'yajl/json_gem'
 require "qy_wechat_api/client"
@@ -13,29 +17,15 @@ module QyWechatApi
   OK_CODE    = 0.freeze
   class << self
-    # for test
-    def corpid
-      "wxb9ce1d023fe6eb69"
-    end
-
-    # for test
-    def corpsecret
-      "UOofFIah4PVLmkG8xMH3lpDxj6NTnQSKMrFt-HubiPB4kjB09EmTVcUjgNeermps"
-    end
     def http_get_without_token(url, params={})
       get_api_url = ENDPOINT_URL + url
-      puts get_api_url
-      puts params
       load_json(RestClient.get(get_api_url, params: params))
     end
     def http_post_without_token(url, payload={}, params={})
       post_api_url = ENDPOINT_URL + url
-      puts post_api_url
-      puts payload
-      puts params
-      payload = JSON.dump(payload)
+      payload = JSON.dump(payload) if !payload[:media].is_a?(File)
       load_json(RestClient.post(post_api_url, payload, params: params))
     end
@@ -4,12 +4,16 @@ module QyWechatApi
   module Api
     class Media < Base
-      def upload
-
+      # 媒体文件类型，分别有图片（image）、语音（voice）、视频（video），普通文件(file)
+      # media: 支持传路径或者文件实例
+      def upload(media, media_type)
+        file = process_file(media)
+        http_post("upload", {media: file}, {type: media_type})
       end
+      # 返回一个URL，请开发者自行使用此url下载
       def get_media_by_id(media_id)
-
+        http_get("get", {media_id: media_id})
       end
       private
@@ -18,6 +22,62 @@ module QyWechatApi
           "/media"
         end
+        def process_file(media)
+          return media if media.is_a?(File) && jpep?(media)
+
+          media_url = media
+          uploader  = QyWechatApiUploader.new
+
+          if http?(media_url) # remote
+            uploader.download!(media_url.to_s)
+          else # local
+            media_file = media.is_a?(File) ? media : File.new(media_url)
+            uploader.cache!(media_file)
+          end
+          file = process_media(uploader)
+          CarrierWave.clean_cached_files! # clear last one day cache
+          file
+        end
+
+        def process_media(uploader)
+          uploader = covert(uploader)
+          uploader.file.to_file
+        end
+
+        # JUST ONLY FOR JPG IMAGE
+        def covert(uploader)
+          # image process
+          unless (uploader.file.content_type =~ /image/).nil?
+            if !jpep?(uploader.file)
+              require "mini_magick"
+              # covert to jpeg
+              image = MiniMagick::Image.open(uploader.path)
+              image.format("jpg")
+              uploader.cache!(File.open(image.path))
+              image.destroy! # remove /tmp from MinMagick generate
+            end
+          end
+          uploader
+        end
+
+        def http?(uri)
+          return false if !uri.is_a?(String)
+          uri = URI.parse(uri)
+          uri.scheme =~ /^https?$/
+        end
+
+        def jpep?(file)
+          content_type = if file.respond_to?(:content_type)
+              file.content_type
+            else
+              content_type(file.path)
+            end
+          !(content_type =~ /jpeg/).nil?
+        end
+
+        def content_type(media_path)
+          MIME::Types.type_for(media_path).first.content_type
+        end
     end
   end
 end
@@ -3,56 +3,6 @@ module QyWechatApi
   module Api
     class Menu < Base
-      # for example:
-      MENU = '{
-            "button": [
-                {
-                    "name": "扫码",
-                    "sub_button": [
-                        {
-                            "type": "scancode_waitmsg",
-                            "name": "扫码带提示",
-                            "key": "rselfmenu_0_0",
-                            "sub_button": [ ]
-                        },
-                        {
-                            "type": "scancode_push",
-                            "name": "扫码推事件",
-                            "key": "rselfmenu_0_1",
-                            "sub_button": [ ]
-                        }
-                    ]
-                },
-                {
-                    "name": "发图",
-                    "sub_button": [
-                        {
-                            "type": "pic_sysphoto",
-                            "name": "系统拍照发图",
-                            "key": "rselfmenu_1_0",
-                           "sub_button": [ ]
-                         },
-                        {
-                            "type": "pic_photo_or_album",
-                            "name": "拍照或者相册发图",
-                            "key": "rselfmenu_1_1",
-                            "sub_button": [ ]
-                        },
-                        {
-                            "type": "pic_weixin",
-                            "name": "微信相册发图",
-                            "key": "rselfmenu_1_2",
-                            "sub_button": [ ]
-                        }
-                    ]
-                },
-                {
-                    "name": "发送位置",
-                    "type": "location_select",
-                    "key": "rselfmenu_2_0"
-                }
-            ]
-        }'
       def create(menu, agent_id)
         menu = JSON.load(menu) if menu.is_a?(String)
         http_post("create", menu, {agentid: agent_id})
@@ -4,8 +4,94 @@ module QyWechatApi
   module Api
     class Message < Base
-      def send
+      # 发送文本
+      def send_text(users, parties, tags, agent_id, content, safe=0)
+        params = common_params("text", agent_id, users, parties, tags, safe)
+        params.merge!({text: {content: content}})
+        http_post("send", params)
+      end
+
+      # 发送图片
+      def send_image(users, parties, tags, agent_id, media_id, safe=0)
+        params = common_params("image", agent_id, users, parties, tags, safe)
+        params.merge!({image: {media_id: media_id}})
+        http_post("send", params)
+      end
+
+      # 发送语音
+      def send_voice(users, parties, tags, agent_id, media_id, safe=0)
+        params = common_params("voice", agent_id, users, parties, tags, safe)
+        params.merge!({voice: {media_id: media_id}})
+        http_post("send", params)
+      end
+
+      # 发送视频
+      # media_options: {title: "title", description: "Description"}
+      def send_video(users, parties, tags, agent_id, media_id, media_options={}, safe=0)
+        params = common_params("video", agent_id, users, parties, tags, safe)
+        params.merge!({
+          video: {
+            media_id: media_id,
+            title: media_options["title"],
+            description: media_options["description"],
+          }
+        })
+        http_post("send", params)
+      end
+      # 文件信息
+      def send_file(users, parties, tags, agent_id, media_id, safe=0)
+        params = common_params("file", agent_id, users, parties, tags, safe)
+        params.merge!({file: {media_id: media_id}})
+        http_post("send", params)
+      end
+
+      # news消息
+      # "articles":[
+      #    {
+      #        "title": "Title",
+      #        "description": "Description",
+      #        "url": "URL",
+      #        "picurl": "PIC_URL"
+      #    },
+      #    {
+      #        "title": "Title",
+      #        "description": "Description",
+      #        "url": "URL",
+      #        "picurl": "PIC_URL"
+      #    }
+      #  ]
+      def send_news(users, parties, tags, agent_id, articles, safe=0)
+        params = common_params("news", agent_id, users, parties, tags, safe)
+        params.merge!({news: {articles: articles}})
+        http_post("send", params)
+      end
+
+      # mpnews
+      # articles":[
+      #            {
+      #                "title": "Title",
+      #                "thumb_media_id": "id",
+      #                "author": "Author",
+      #                "content_source_url": "URL",
+      #                "content": "Content",
+      #                "digest": "Digest description",
+      #                "show_cover_pic": "0"
+      #            },
+      #            {
+      #                "title": "Title",
+      #                "thumb_media_id": "id",
+      #                "author": "Author",
+      #                "content_source_url": "URL",
+      #                "content": "Content",
+      #                "digest": "Digest description",
+      #                "show_cover_pic": "0"
+      #            }
+      #        ]
+      def send_mpnews(users, parties, tags, agent_id, articles, safe=0)
+        params = common_params("mpnews", agent_id, users, parties, tags, safe)
+        params.merge!({mpnews: {articles: articles}})
+        http_post("send", params)
       end
       private
@@ -14,6 +100,24 @@ module QyWechatApi
           "/message"
         end
+        # 通用函数
+        def common_params(msg_type, agent_id, users=[], parties=[], tags=[], safe=0)
+          params = {
+            touser: join(users),
+            toparty: join(parties),
+            msgtype: msg_type,
+            agentid: agent_id,
+            totag: join(tags)
+          }
+          params.merge!({safe: safe}) if msg_type != "news"
+          params
+        end
+
+        def join(array, split="|")
+          return array if array.is_a?(String)
+          array.join(split)
+        end
+
     end
   end
 end
@@ -0,0 +1,5 @@
+# encoding: utf-8
+module QyWechatApi
+  class QyWechatApiUploader < CarrierWave::Uploader::Base
+  end
+end
@@ -44,7 +44,7 @@ module QyWechatApi
     private
       def get_access_token
-        self.access_token ||= get_token.result[:access_token]
+        self.access_token ||= get_token.result["access_token"]
       end
       # 获取token
@@ -24,6 +24,9 @@ Gem::Specification.new do |spec|
   # https://github.com/brianmario/yajl-ruby
   spec.add_dependency "yajl-ruby", "~> 1.2.0"
+  spec.add_dependency "carrierwave", "~> 0.10.0"
+  spec.add_dependency 'mini_magick', '~> 3.7.0'
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end
@@ -0,0 +1,72 @@
+require "spec_helper"
+
+describe QyWechatApi::Api::Media do
+
+  let(:image_jpg_path) do
+    "#{File.dirname(__FILE__)}/medias/ruby-logo.jpg"
+  end
+
+  let(:image_ico_path) do
+    "#{File.dirname(__FILE__)}/medias/favicon.ico"
+  end
+
+  let(:image_jpg_file) do
+    File.new(image_jpg_path)
+  end
+
+  let(:image_ico_file) do
+    File.new(image_ico_path)
+  end
+
+  let(:remote_png_path) do
+    "https://ruby-china-files.b0.upaiyun.com/user/big_avatar/273.jpg"
+  end
+
+  let(:remote_jpg_path) do
+    "http://g.hiphotos.baidu.com/baike/c0%3Dbaike80%2C5%2C5%2C80%2C26/sign=ce55457e4334970a537e187df4a3baad/03087bf40ad162d99455ef4d13dfa9ec8b13632762d0ed14.jpg"
+  end
+
+  it "can upload a jpg File image" do
+    response = $client.media.upload(image_jpg_file, "image")
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a ico File image" do
+    response = $client.media.upload(image_ico_file, "image")
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a local image" do
+    response = $client.media.upload(image_jpg_path, "image")
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a local ico image" do
+    response = $client.media.upload(image_ico_path, "image")
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a remote png image" do
+    response = $client.media.upload(remote_png_path, "image")
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a remote jpg image" do
+    response = $client.media.upload(remote_jpg_path, "image")
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  # it "#download_media_url return a String url" do
+  #   image = $client.media.upload(image_ico_path, "image")
+  #   media_id = image.result["media_id"]
+  #   image_url = $client.download_media_url(media_id)
+  #   expect(image_url.class).to eq(String)
+  # end
+
+end
@@ -0,0 +1,60 @@
+require "spec_helper"
+
+describe QyWechatApi::Api::Menu do
+  let(:menu_string) do
+    '{
+      "button": [
+        {
+          "name": "扫码",
+          "sub_button": [
+            {
+              "type": "scancode_waitmsg",
+              "name": "扫码带提示",
+              "key": "rselfmenu_0_0",
+              "sub_button": [ ]
+            },
+            {
+              "type": "scancode_push",
+              "name": "扫码推事件",
+              "key": "rselfmenu_0_1",
+              "sub_button": [ ]
+            }
+          ]
+        },
+        {
+          "name": "发图",
+          "sub_button": [
+            {
+              "type": "pic_sysphoto",
+              "name": "系统拍照发图",
+              "key": "rselfmenu_1_0",
+              "sub_button": [ ]
+             },
+            {
+              "type": "pic_photo_or_album",
+              "name": "拍照或者相册发图",
+              "key": "rselfmenu_1_1",
+              "sub_button": [ ]
+            },
+            {
+              "type": "pic_weixin",
+              "name": "微信相册发图",
+              "key": "rselfmenu_1_2",
+              "sub_button": [ ]
+            }
+          ]
+        },
+        {
+          "name": "发送位置",
+          "type": "location_select",
+          "key": "rselfmenu_2_0"
+        }
+      ]
+    }'
+  end
+
+  it "#create" do
+    response = $client.menu.create(menu_string, 1)
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+  end
+end
@@ -0,0 +1,50 @@
+require "spec_helper"
+describe QyWechatApi::Api::Message do
+  let(:text_message) do
+    "text message"
+  end
+
+  let(:image_path) do
+    "#{File.dirname(__FILE__)}/medias/ruby-logo.jpg"
+  end
+
+  let(:image_file) do
+    File.new(image_path)
+  end
+
+  it "#send_text_message" do
+    response = $client.message.send_text("@all", "@all", "@all", 1, text_message)
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+  end
+
+  it "#send_image_message" do
+    response = $client.media.upload(image_path, "image").result
+    response = $client.message.send_image("@all", "@all", "@all", 1, response["media_id"])
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+  end
+
+
+  it "#send_news" do
+    articles = [{
+                  "title" => "Happy Day",
+                  "description" => "Is Really A Happy Day",
+                  "url"   => "http://www.baidu.com",
+                  "picurl" => "http://www.baidu.com/img/bdlogo.gif"
+                },
+                {
+                  "title" => "Happy Day",
+                  "description" => "Is Really A Happy Day",
+                  "url"  => "http://www.baidu.com",
+                  "picurl"=> "http://www.baidu.com/img/bdlogo.gif"
+                }]
+    response = $client.message.send_news("@all", "@all", "@all", 1, articles)
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+  end
+
+  it "#send_file" do
+    response = $client.media.upload(image_path, "image").result
+    response = $client.message.send_file("@all", "@all", "@all", 1, response["media_id"])
+    expect(response.code).to eq(QyWechatApi::OK_CODE)
+  end
+
+end
@@ -14,6 +14,15 @@
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require "qy_wechat_api"
+require "pry-rails"
+
+corpid = "wxb9ce1d023fe6eb69"
+corpsecret = "UOofFIah4PVLmkG8xMH3lpDxj6NTnQSKMrFt-HubiPB4kjB09EmTVcUjgNeermps"
+
+
+$client = QyWechatApi::Client.new(corpid, corpsecret)
+
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
	@@ -20,3 +20,4 @@ tmp		@@ -20,3 +20,4 @@ tmp
20	*.o	20	*.o
21	*.a	21	*.a
22	mkmf.log	22	mkmf.log
		23	+.DS_Store
	@@ -78,4 +78,23 @@ group_client.oauth.authorize_url("http://2458023e.ngrok.com", "state")		@@ -78,4 +78,23 @@ group_client.oauth.authorize_url("http://2458023e.ngrok.com", "state")
78	group_client.oauth.get_user_info("code", "app_id")	78	group_client.oauth.get_user_info("code", "app_id")
79	```	79	```
80		80
		81	+## 发送消息
		82	+
		83	+```ruby
		84	+ # params: (users, parties, tags, agent_id, content, safe=0)
		85	+ # users, parties, tags 如果是多个用户，传数组，如果是全部，则直接传 "@all"
		86	+ group_client.message.send_text("@all", "@all", "@all", app_id, text_message)
		87	+```
		88	+其他发送消息方法请查看 api/message.rb
		89	+
		90	+## 上传多媒体文件
		91	+```ruby
		92	+# params: media, media_type
		93	+group_client.media.upload(image_jpg_file, "image")
		94	+
		95	+# 获取下载链接
		96	+# 返回一个URL，请开发者自行使用此url下载
		97	+group_client.media.get_media_by_id(media_id)
		98	+```
		99	+
81		100
	@@ -4,12 +4,16 @@ module QyWechatApi		@@ -4,12 +4,16 @@ module QyWechatApi
4	module Api	4	module Api
5	class Media < Base	5	class Media < Base
6		6
7	- def upload
8	-	7	+ # 媒体文件类型，分别有图片（image）、语音（voice）、视频（video），普通文件(file)
		8	+ # media: 支持传路径或者文件实例
		9	+ def upload(media, media_type)
		10	+ file = process_file(media)
		11	+ http_post("upload", {media: file}, {type: media_type})
9	end	12	end
10		13
		14	+ # 返回一个URL，请开发者自行使用此url下载
11	def get_media_by_id(media_id)	15	def get_media_by_id(media_id)
12	-	16	+ http_get("get", {media_id: media_id})
13	end	17	end
14		18
15	private	19	private
	@@ -18,6 +22,62 @@ module QyWechatApi		@@ -18,6 +22,62 @@ module QyWechatApi
18	"/media"	22	"/media"
19	end	23	end
20		24
		25	+ def process_file(media)
		26	+ return media if media.is_a?(File) && jpep?(media)
		27	+
		28	+ media_url = media
		29	+ uploader = QyWechatApiUploader.new
		30	+
		31	+ if http?(media_url) # remote
		32	+ uploader.download!(media_url.to_s)
		33	+ else # local
		34	+ media_file = media.is_a?(File) ? media : File.new(media_url)
		35	+ uploader.cache!(media_file)
		36	+ end
		37	+ file = process_media(uploader)
		38	+ CarrierWave.clean_cached_files! # clear last one day cache
		39	+ file
		40	+ end
		41	+
		42	+ def process_media(uploader)
		43	+ uploader = covert(uploader)
		44	+ uploader.file.to_file
		45	+ end
		46	+
		47	+ # JUST ONLY FOR JPG IMAGE
		48	+ def covert(uploader)
		49	+ # image process
		50	+ unless (uploader.file.content_type =~ /image/).nil?
		51	+ if !jpep?(uploader.file)
		52	+ require "mini_magick"
		53	+ # covert to jpeg
		54	+ image = MiniMagick::Image.open(uploader.path)
		55	+ image.format("jpg")
		56	+ uploader.cache!(File.open(image.path))
		57	+ image.destroy! # remove /tmp from MinMagick generate
		58	+ end
		59	+ end
		60	+ uploader
		61	+ end
		62	+
		63	+ def http?(uri)
		64	+ return false if !uri.is_a?(String)
		65	+ uri = URI.parse(uri)
		66	+ uri.scheme =~ /^https?$/
		67	+ end
		68	+
		69	+ def jpep?(file)
		70	+ content_type = if file.respond_to?(:content_type)
		71	+ file.content_type
		72	+ else
		73	+ content_type(file.path)
		74	+ end
		75	+ !(content_type =~ /jpeg/).nil?
		76	+ end
		77	+
		78	+ def content_type(media_path)
		79	+ MIME::Types.type_for(media_path).first.content_type
		80	+ end
21	end	81	end
22	end	82	end
23	end	83	end
	@@ -3,56 +3,6 @@ module QyWechatApi		@@ -3,56 +3,6 @@ module QyWechatApi
3	module Api	3	module Api
4	class Menu < Base	4	class Menu < Base
5		5
6	- # for example:
7	- MENU = '{
8	- "button": [
9	- {
10	- "name": "扫码",
11	- "sub_button": [
12	- {
13	- "type": "scancode_waitmsg",
14	- "name": "扫码带提示",
15	- "key": "rselfmenu_0_0",
16	- "sub_button": [ ]
17	- },
18	- {
19	- "type": "scancode_push",
20	- "name": "扫码推事件",
21	- "key": "rselfmenu_0_1",
22	- "sub_button": [ ]
23	- }
24	- ]
25	- },
26	- {
27	- "name": "发图",
28	- "sub_button": [
29	- {
30	- "type": "pic_sysphoto",
31	- "name": "系统拍照发图",
32	- "key": "rselfmenu_1_0",
33	- "sub_button": [ ]
34	- },
35	- {
36	- "type": "pic_photo_or_album",
37	- "name": "拍照或者相册发图",
38	- "key": "rselfmenu_1_1",
39	- "sub_button": [ ]
40	- },
41	- {
42	- "type": "pic_weixin",
43	- "name": "微信相册发图",
44	- "key": "rselfmenu_1_2",
45	- "sub_button": [ ]
46	- }
47	- ]
48	- },
49	- {
50	- "name": "发送位置",
51	- "type": "location_select",
52	- "key": "rselfmenu_2_0"
53	- }
54	- ]
55	- }'
56	def create(menu, agent_id)	6	def create(menu, agent_id)
57	menu = JSON.load(menu) if menu.is_a?(String)	7	menu = JSON.load(menu) if menu.is_a?(String)
58	http_post("create", menu, {agentid: agent_id})	8	http_post("create", menu, {agentid: agent_id})
	@@ -4,8 +4,94 @@ module QyWechatApi		@@ -4,8 +4,94 @@ module QyWechatApi
4	module Api	4	module Api
5	class Message < Base	5	class Message < Base
6		6
7	- def send	7	+ # 发送文本
		8	+ def send_text(users, parties, tags, agent_id, content, safe=0)
		9	+ params = common_params("text", agent_id, users, parties, tags, safe)
		10	+ params.merge!({text: {content: content}})
		11	+ http_post("send", params)
		12	+ end
		13	+
		14	+ # 发送图片
		15	+ def send_image(users, parties, tags, agent_id, media_id, safe=0)
		16	+ params = common_params("image", agent_id, users, parties, tags, safe)
		17	+ params.merge!({image: {media_id: media_id}})
		18	+ http_post("send", params)
		19	+ end
		20	+
		21	+ # 发送语音
		22	+ def send_voice(users, parties, tags, agent_id, media_id, safe=0)
		23	+ params = common_params("voice", agent_id, users, parties, tags, safe)
		24	+ params.merge!({voice: {media_id: media_id}})
		25	+ http_post("send", params)
		26	+ end
		27	+
		28	+ # 发送视频
		29	+ # media_options: {title: "title", description: "Description"}
		30	+ def send_video(users, parties, tags, agent_id, media_id, media_options={}, safe=0)
		31	+ params = common_params("video", agent_id, users, parties, tags, safe)
		32	+ params.merge!({
		33	+ video: {
		34	+ media_id: media_id,
		35	+ title: media_options["title"],
		36	+ description: media_options["description"],
		37	+ }
		38	+ })
		39	+ http_post("send", params)
		40	+ end
8		41
		42	+ # 文件信息
		43	+ def send_file(users, parties, tags, agent_id, media_id, safe=0)
		44	+ params = common_params("file", agent_id, users, parties, tags, safe)
		45	+ params.merge!({file: {media_id: media_id}})
		46	+ http_post("send", params)
		47	+ end
		48	+
		49	+ # news消息
		50	+ # "articles":[
		51	+ # {
		52	+ # "title": "Title",
		53	+ # "description": "Description",
		54	+ # "url": "URL",
		55	+ # "picurl": "PIC_URL"
		56	+ # },
		57	+ # {
		58	+ # "title": "Title",
		59	+ # "description": "Description",
		60	+ # "url": "URL",
		61	+ # "picurl": "PIC_URL"
		62	+ # }
		63	+ # ]
		64	+ def send_news(users, parties, tags, agent_id, articles, safe=0)
		65	+ params = common_params("news", agent_id, users, parties, tags, safe)
		66	+ params.merge!({news: {articles: articles}})
		67	+ http_post("send", params)
		68	+ end
		69	+
		70	+ # mpnews
		71	+ # articles":[
		72	+ # {
		73	+ # "title": "Title",
		74	+ # "thumb_media_id": "id",
		75	+ # "author": "Author",
		76	+ # "content_source_url": "URL",
		77	+ # "content": "Content",
		78	+ # "digest": "Digest description",
		79	+ # "show_cover_pic": "0"
		80	+ # },
		81	+ # {
		82	+ # "title": "Title",
		83	+ # "thumb_media_id": "id",
		84	+ # "author": "Author",
		85	+ # "content_source_url": "URL",
		86	+ # "content": "Content",
		87	+ # "digest": "Digest description",
		88	+ # "show_cover_pic": "0"
		89	+ # }
		90	+ # ]
		91	+ def send_mpnews(users, parties, tags, agent_id, articles, safe=0)
		92	+ params = common_params("mpnews", agent_id, users, parties, tags, safe)
		93	+ params.merge!({mpnews: {articles: articles}})
		94	+ http_post("send", params)
9	end	95	end
10		96
11	private	97	private
	@@ -14,6 +100,24 @@ module QyWechatApi		@@ -14,6 +100,24 @@ module QyWechatApi
14	"/message"	100	"/message"
15	end	101	end
16		102
		103	+ # 通用函数
		104	+ def common_params(msg_type, agent_id, users=[], parties=[], tags=[], safe=0)
		105	+ params = {
		106	+ touser: join(users),
		107	+ toparty: join(parties),
		108	+ msgtype: msg_type,
		109	+ agentid: agent_id,
		110	+ totag: join(tags)
		111	+ }
		112	+ params.merge!({safe: safe}) if msg_type != "news"
		113	+ params
		114	+ end
		115	+
		116	+ def join(array, split="\|")
		117	+ return array if array.is_a?(String)
		118	+ array.join(split)
		119	+ end
		120	+
17	end	121	end
18	end	122	end
19	end	123	end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+# encoding: utf-8
	2	+module QyWechatApi
	3	+ class QyWechatApiUploader < CarrierWave::Uploader::Base
	4	+ end
	5	+end
	@@ -44,7 +44,7 @@ module QyWechatApi		@@ -44,7 +44,7 @@ module QyWechatApi
44		44
45	private	45	private
46	def get_access_token	46	def get_access_token
47	- self.access_token \|\|= get_token.result[:access_token]	47	+ self.access_token \|\|= get_token.result["access_token"]
48	end	48	end
49		49
50	# 获取token	50	# 获取token
@@ -0,0 +1,72 @@		@@ -0,0 +1,72 @@
	1	+require "spec_helper"
	2	+
	3	+describe QyWechatApi::Api::Media do
	4	+
	5	+ let(:image_jpg_path) do
	6	+ "#{File.dirname(__FILE__)}/medias/ruby-logo.jpg"
	7	+ end
	8	+
	9	+ let(:image_ico_path) do
	10	+ "#{File.dirname(__FILE__)}/medias/favicon.ico"
	11	+ end
	12	+
	13	+ let(:image_jpg_file) do
	14	+ File.new(image_jpg_path)
	15	+ end
	16	+
	17	+ let(:image_ico_file) do
	18	+ File.new(image_ico_path)
	19	+ end
	20	+
	21	+ let(:remote_png_path) do
	22	+ "https://ruby-china-files.b0.upaiyun.com/user/big_avatar/273.jpg"
	23	+ end
	24	+
	25	+ let(:remote_jpg_path) do
	26	+ "http://g.hiphotos.baidu.com/baike/c0%3Dbaike80%2C5%2C5%2C80%2C26/sign=ce55457e4334970a537e187df4a3baad/03087bf40ad162d99455ef4d13dfa9ec8b13632762d0ed14.jpg"
	27	+ end
	28	+
	29	+ it "can upload a jpg File image" do
	30	+ response = $client.media.upload(image_jpg_file, "image")
	31	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	32	+ expect(response.result.keys).to eq(["type", "media_id", "created_at"])
	33	+ end
	34	+
	35	+ it "can upload a ico File image" do
	36	+ response = $client.media.upload(image_ico_file, "image")
	37	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	38	+ expect(response.result.keys).to eq(["type", "media_id", "created_at"])
	39	+ end
	40	+
	41	+ it "can upload a local image" do
	42	+ response = $client.media.upload(image_jpg_path, "image")
	43	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	44	+ expect(response.result.keys).to eq(["type", "media_id", "created_at"])
	45	+ end
	46	+
	47	+ it "can upload a local ico image" do
	48	+ response = $client.media.upload(image_ico_path, "image")
	49	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	50	+ expect(response.result.keys).to eq(["type", "media_id", "created_at"])
	51	+ end
	52	+
	53	+ it "can upload a remote png image" do
	54	+ response = $client.media.upload(remote_png_path, "image")
	55	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	56	+ expect(response.result.keys).to eq(["type", "media_id", "created_at"])
	57	+ end
	58	+
	59	+ it "can upload a remote jpg image" do
	60	+ response = $client.media.upload(remote_jpg_path, "image")
	61	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	62	+ expect(response.result.keys).to eq(["type", "media_id", "created_at"])
	63	+ end
	64	+
	65	+ # it "#download_media_url return a String url" do
	66	+ # image = $client.media.upload(image_ico_path, "image")
	67	+ # media_id = image.result["media_id"]
	68	+ # image_url = $client.download_media_url(media_id)
	69	+ # expect(image_url.class).to eq(String)
	70	+ # end
	71	+
	72	+end
@@ -0,0 +1,60 @@		@@ -0,0 +1,60 @@
	1	+require "spec_helper"
	2	+
	3	+describe QyWechatApi::Api::Menu do
	4	+ let(:menu_string) do
	5	+ '{
	6	+ "button": [
	7	+ {
	8	+ "name": "扫码",
	9	+ "sub_button": [
	10	+ {
	11	+ "type": "scancode_waitmsg",
	12	+ "name": "扫码带提示",
	13	+ "key": "rselfmenu_0_0",
	14	+ "sub_button": [ ]
	15	+ },
	16	+ {
	17	+ "type": "scancode_push",
	18	+ "name": "扫码推事件",
	19	+ "key": "rselfmenu_0_1",
	20	+ "sub_button": [ ]
	21	+ }
	22	+ ]
	23	+ },
	24	+ {
	25	+ "name": "发图",
	26	+ "sub_button": [
	27	+ {
	28	+ "type": "pic_sysphoto",
	29	+ "name": "系统拍照发图",
	30	+ "key": "rselfmenu_1_0",
	31	+ "sub_button": [ ]
	32	+ },
	33	+ {
	34	+ "type": "pic_photo_or_album",
	35	+ "name": "拍照或者相册发图",
	36	+ "key": "rselfmenu_1_1",
	37	+ "sub_button": [ ]
	38	+ },
	39	+ {
	40	+ "type": "pic_weixin",
	41	+ "name": "微信相册发图",
	42	+ "key": "rselfmenu_1_2",
	43	+ "sub_button": [ ]
	44	+ }
	45	+ ]
	46	+ },
	47	+ {
	48	+ "name": "发送位置",
	49	+ "type": "location_select",
	50	+ "key": "rselfmenu_2_0"
	51	+ }
	52	+ ]
	53	+ }'
	54	+ end
	55	+
	56	+ it "#create" do
	57	+ response = $client.menu.create(menu_string, 1)
	58	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	59	+ end
	60	+end
@@ -0,0 +1,50 @@		@@ -0,0 +1,50 @@
	1	+require "spec_helper"
	2	+describe QyWechatApi::Api::Message do
	3	+ let(:text_message) do
	4	+ "text message"
	5	+ end
	6	+
	7	+ let(:image_path) do
	8	+ "#{File.dirname(__FILE__)}/medias/ruby-logo.jpg"
	9	+ end
	10	+
	11	+ let(:image_file) do
	12	+ File.new(image_path)
	13	+ end
	14	+
	15	+ it "#send_text_message" do
	16	+ response = $client.message.send_text("@all", "@all", "@all", 1, text_message)
	17	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	18	+ end
	19	+
	20	+ it "#send_image_message" do
	21	+ response = $client.media.upload(image_path, "image").result
	22	+ response = $client.message.send_image("@all", "@all", "@all", 1, response["media_id"])
	23	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	24	+ end
	25	+
	26	+
	27	+ it "#send_news" do
	28	+ articles = [{
	29	+ "title" => "Happy Day",
	30	+ "description" => "Is Really A Happy Day",
	31	+ "url" => "http://www.baidu.com",
	32	+ "picurl" => "http://www.baidu.com/img/bdlogo.gif"
	33	+ },
	34	+ {
	35	+ "title" => "Happy Day",
	36	+ "description" => "Is Really A Happy Day",
	37	+ "url" => "http://www.baidu.com",
	38	+ "picurl"=> "http://www.baidu.com/img/bdlogo.gif"
	39	+ }]
	40	+ response = $client.message.send_news("@all", "@all", "@all", 1, articles)
	41	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	42	+ end
	43	+
	44	+ it "#send_file" do
	45	+ response = $client.media.upload(image_path, "image").result
	46	+ response = $client.message.send_file("@all", "@all", "@all", 1, response["media_id"])
	47	+ expect(response.code).to eq(QyWechatApi::OK_CODE)
	48	+ end
	49	+
	50	+end