wx_ext 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53373828789ebd3ab2f05921de302c7e3cec984e
-  data.tar.gz: 5ffb60baac576500d9e1e7cea5404903d27e2b0d
+  metadata.gz: f8a9175b614f4a055da85f6303f46a43e49960fd
+  data.tar.gz: fa906a29a4b0b5c7aa4cebc193941af670912185
 SHA512:
-  metadata.gz: f7ba4f709afccc8075780147c451b763c1f388403b3beb23caa7781d459ab4ee39f62baebcd378e289a91ddd2db2327c1a8e5cb1a8bdc39b87dc7e5176b4e7af
-  data.tar.gz: e46026e8ded4ae222b94ba7aa9cc269ad24f463c7700f3d07f0340e75f673348770a612fbd24bfe832e5472e88ca919aa37aa2be75df5b2660bb9e99397f780c
+  metadata.gz: fe8b3ff1f7086f4bb70ee9f12ed3faaf0c90dda65a548a0c0ab05db31ef508c5540e65a95e4c40ee2da7c9000a960fad8d5af9a4a07518a215a9cd58c2ec5a03
+  data.tar.gz: 361b995e41b4b3bc565bd71bfa3ec74d81db33a8519bc09bc2ed26cfd4f745f05fd46ea1b34cad2ea4ebe1400eec4eed3a9e8440effc4bf44274b4bdfe7bd93a

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'wx_ext', '~> 0.0.2'
+gem 'wx_ext', '~> 0.0.3'
 ```
 
 And then execute:

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')

data/lib/wx_ext/version.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module WxExt
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/wx_ext.rb

@@ -22,50 +22,62 @@ module WxExt
     end
 
     # 使用用户名和密码登陆微信公众平台获取access_token, 过期时间是7200s
-    def init
-      login_name = @account
+    def login
       password = Digest::MD5.hexdigest @password
-      home_url = @home_url
-
       login_headers = {
-          referer: 'https://mp.weixin.qq.com/'
+        referer: 'https://mp.weixin.qq.com/'
       }
       login_params = {
-          username: login_name,
-          pwd: password,
-          imgcode: '',
-          f: 'json'
+        username: @account,
+        pwd: password,
+        imgcode: '',
+        f: 'json'
       }
 
-      login_resource = RestClient::Resource.new(home_url, :headers => login_headers)
-      login_res = login_resource['cgi-bin/login'].post login_params, :content_type => 'text/plain'
-      login_cookies = login_res.cookies
-      login_res_str = login_res.to_s
+      resource = RestClient::Resource.new(@home_url, headers: login_headers)
+      res = resource['cgi-bin/login'].post login_params
+      @cookies = res.cookies
+      return_hash = {
+        status: 0,
+        msg: 'ok'
+      }
       # {"base_resp"=>{"ret"=>0, "err_msg"=>"ok"}, "redirect_url"=>"/cgi-bin/home?t=home/index&lang=zh_CN&token=1869497342"}
       # {"base_resp":{"ret":-8,"err_msg":"need verify code"}}
       # https://mp.weixin.qq.com/cgi-bin/verifycode?username=tuodan@thecampus.cc&r=1415774604450
-      login_res_hash = JSON.parse login_res_str
-      token_reg = /.*token=(\d+)\".*/
-      if token_reg =~ login_res_str
-        @token = $1
+      res_hash = JSON.parse res.to_s
+      if res_hash['base_resp']['ret'].to_s == '0'
+        token_reg = /.*token=(\d+)\".*/
+        @token = $1 if token_reg =~ res.to_s
+      elsif res_hash['bash_resp']['ret'].to_s == '-8'
+        return_hash = {
+          status: -8,
+          msg: 'need_varify_code'
+        }
+      else
+        return_hash = {
+          status: -1,
+          msg: 'system_error'
+        }
       end
+      return_hash
+    end
 
-      msg_send_url = "https://mp.weixin.qq.com/cgi-bin/masssendpage?t=mass/send&token=#{@token}&lang=zh_CN"
-      msg_send_page = RestClient.get msg_send_url, {cookies: login_cookies}
-      @cookies = login_cookies.merge msg_send_page.cookies
+    # 初始化 ticket, cookies, operation_seq, user_name 等等信息
+    def init
+      msg_send_url = 'https://mp.weixin.qq.com/cgi-bin/masssendpage'\
+                     "?t=mass/send&token=#{@token}&lang=zh_CN"
+      msg_send_page = RestClient.get msg_send_url, cookies: @cookies
+      @cookies = @cookies.merge msg_send_page.cookies
 
       ticket_reg = /.*ticket\s*:\s*\"(\w+)\".*user_name\s*:\s*\"(\w+)\".*nick_name\s*:\s*\"(.*)\".*/m
-
       operation_seq_reg = /.*operation_seq\s*:\s*\"(\d+)\".*/
-      if operation_seq_reg =~ msg_send_page.to_s
-        @operation_seq = $1
-      end
+      @operation_seq = $1 if operation_seq_reg =~ msg_send_page.to_s
       if ticket_reg =~ msg_send_page.to_s
         @ticket = $1
         @user_name = @ticket_id= $2
         true
       else
-        nil
+        false
       end
     end
 
@@ -83,54 +95,63 @@ module WxExt
       post_single_msg_uri = 'cgi-bin/operate_appmsg'\
                             '?t=ajax-response&sub=create&type=10&token'\
                             "=#{@token}&lang=zh_CN"
-      post_single_msg_headers = {
+      headers = {
         referer: 'https://mp.weixin.qq.com/cgi-bin/appmsg?t=media/appmsg_edit'\
-                 "&action=edit&type=10&isMul=0&isNew=1&lang=zh_CN&token=#{@token}"
+                 '&action=edit&type=10&isMul=0&isNew=1&lang=zh_CN'\
+                 "&token=#{@token}"
       }
-      post_single_msg_resource = RestClient::Resource.new(@home_url,
-                                 headers: post_single_msg_headers,
-                                 cookies: @cookies)
-      post_single_msg_res = post_single_msg_resource[post_single_msg_uri].post single_msg_params
+      resource = RestClient::Resource.new(@home_url, headers: headers,
+                                                     cookies: @cookies)
+      res = resource[post_single_msg_uri].post single_msg_params
       # {"ret":"0", "msg":"OK"}
-      res_hash = JSON.parse post_single_msg_res.to_s
+      JSON.parse res.to_s
     end
 
     # 发送多图文到素材中心
     def upload_multi_msg(msg_params)
-      post_msg_uri = "cgi-bin/operate_appmsg?t=ajax-response&sub=create&type=10&token=#{@token}&lang=zh_CN"
-      post_msg_headers = {
-          referer: "https://mp.weixin.qq.com/cgi-bin/appmsg?t=media/appmsg_edit&action=edit&type=10&isMul=1&isNew=1&lang=zh_CN&token=#{@token}"
+      uri = 'cgi-bin/operate_appmsg?t=ajax-response&sub=create&type=10'\
+                     "&token=#{@token}&lang=zh_CN"
+      headers = {
+        referer: 'https://mp.weixin.qq.com/cgi-bin/appmsg'\
+                 '?t=media/appmsg_edit&action=edit&type=10'\
+                 "&isMul=1&isNew=1&lang=zh_CN&token=#{@token}"
       }
-      post_msg_resource = RestClient::Resource.new(@home_url, headers: post_msg_headers, cookies: @cookies)
-      post_msg_res = post_msg_resource[post_msg_uri].post msg_params
+      resource = RestClient::Resource.new(@home_url, headers: headers,
+                                                     cookies: @cookies)
+      post_msg_res = resource[uri].post msg_params
       # {"ret":"0", "msg":"OK"}
-      res_hash = JSON.parse post_msg_res.to_s
+      JSON.parse post_msg_res.to_s
     end
 
     # 群发图文消息
     def broadcast_msg(msg_params)
-      post_msg_uri = "cgi-bin/masssend?t=ajax-response&token=#{@token}&lang=zh_CN"
-      post_msg_headers = {
-          referer: "https://mp.weixin.qq.com/cgi-bin/masssendpage?t=mass/send&token=#{token}&lang=zh_CN",
-          host: 'mp.weixin.qq.com'
+      uri = "cgi-bin/masssend?t=ajax-response&token=#{@token}&lang=zh_CN"
+      headers = {
+        referer: 'https://mp.weixin.qq.com/cgi-bin/masssendpage'\
+                 "?t=mass/send&token=#{token}&lang=zh_CN",
+        host: 'mp.weixin.qq.com'
       }
-      post_msg_resource = RestClient::Resource.new(@home_url, :headers => post_msg_headers, cookies: @cookies)
-      post_msg_res = post_msg_resource[post_msg_uri].post msg_params
+      resource = RestClient::Resource.new(@home_url, headers: headers,
+                                                     cookies: @cookies)
+      post_msg_res = resource[uri].post msg_params
       # {"ret":"0", "msg":"OK"}
-      puts post_msg_res.to_s
-      res_hash = JSON.parse post_msg_res.to_s
+      JSON.parse post_msg_res.to_s
     end
 
     # 获取所有的图文列表
     def get_app_msg_list(msg_begin = 0, msg_count = 10)
-      app_msg_url = "https://mp.weixin.qq.com/cgi-bin/appmsg?type=10&action=list&begin=#{msg_begin}&count=#{msg_count}&f=json&token=#{@token}&lang=zh_CN&token=#{@token}&lang=zh_CN&f=json&ajax=1&random=#{rand}"
-      msg_json = RestClient.get app_msg_url, {cookies: @cookies}
-      app_msg_hash = JSON.parse msg_json.to_s
+      url = 'https://mp.weixin.qq.com/cgi-bin/appmsg?type=10&action=list'\
+            "&begin=#{msg_begin}&count=#{msg_count}&f=json&token=#{@token}"\
+            "&lang=zh_CN&token=#{@token}&lang=zh_CN&f=json&ajax=1"\
+            "&random=#{rand}"
+      msg_json = RestClient.get url, cookies: @cookies
+      JSON.parse msg_json.to_s
     end
 
 		# 轮训新消息条数
 		def get_new_msg_num(last_msg_id)
-      uri = "cgi-bin/getnewmsgnum?f=json&t=ajax-getmsgnum&lastmsgid=#{last_msg_id}&token=#{@token}&lang=zh_CN"
+      uri = 'cgi-bin/getnewmsgnum?f=json&t=ajax-getmsgnum'\
+            "&lastmsgid=#{last_msg_id}&token=#{@token}&lang=zh_CN"
       post_params = {
         ajax: 1,
         f: 'json',
@@ -139,16 +160,19 @@ module WxExt
         token: @token
       }
       post_headers = {
-          referer: "https://mp.weixin.qq.com/cgi-bin/message?t=message/list&count=20&day=7&token=#{@token}&lang=zh_CN"
+        referer: 'https://mp.weixin.qq.com/cgi-bin/message?t=message/list'\
+                 "&count=20&day=7&token=#{@token}&lang=zh_CN"
       }
-      resource = RestClient::Resource.new(@home_url, :headers => post_headers, cookies: @cookies)
+      resource = RestClient::Resource.new(@home_url, headers: post_headers,
+                                                     cookies: @cookies)
       res = resource[uri].post post_params
-      res_json = JSON.parse res.to_s
+      JSON.parse res.to_s
 		end
 
 		# 获取联系人信息
 		def get_contact_info(fakeid)
-      uri = "cgi-bin/getcontactinfo?t=ajax-getcontactinfo&lang=zh_CN&fakeid=#{fakeid}"
+      uri = 'cgi-bin/getcontactinfo?t=ajax-getcontactinfo'\
+            "&lang=zh_CN&fakeid=#{fakeid}"
       post_params = {
         ajax: 1,
         f: 'json',
@@ -157,43 +181,57 @@ module WxExt
         token: @token
       }
       post_headers = {
-          referer: "https://mp.weixin.qq.com/cgi-bin/contactmanage?t=user/index&pagesize=10&pageidx=0&type=0&token=#{@token}&lang=zh_CN"
+        referer: 'https://mp.weixin.qq.com/cgi-bin/contactmanage?t=user/index'\
+                 "&pagesize=10&pageidx=0&type=0&token=#{@token}&lang=zh_CN"
       }
-      resource = RestClient::Resource.new(@home_url, :headers => post_headers, cookies: @cookies)
+      resource = RestClient::Resource.new(@home_url, headers: post_headers,
+                                                     cookies: @cookies)
       res = resource[uri].post post_params
-      res_json = JSON.parse res.to_s
+      JSON.parse res.to_s
 	  end
 
     # 获取国家列表
     def get_country_list
-      url = "https://mp.weixin.qq.com/cgi-bin/getregions?t=setting/ajax-getregions&id=0&token=#{@token}&lang=zh_CN&token=#{@token}&lang=zh_CN&f=json&ajax=1&random=#{rand}"
+      url = 'https://mp.weixin.qq.com/cgi-bin/getregions'\
+            "?t=setting/ajax-getregions&id=0&token=#{@token}&lang=zh_CN"\
+            "&token=#{@token}&lang=zh_CN&f=json&ajax=1&random=#{rand}"
       resource = RestClient::Resource.new(url, cookies: @cookies)
       res = resource.get
-      res_json = JSON.parse res.to_s
+      JSON.parse res.to_s
     end
 
     # 获取每日可推送消息数
     def get_day_msg_count
-      url = "https://mp.weixin.qq.com/cgi-bin/masssendpage?t=mass/send&token=#{@token}&lang=zh_CN"
-      res = RestClient.get(url, {cookies: @cookies})
+      url = 'https://mp.weixin.qq.com/cgi-bin/masssendpage'\
+            "?t=mass/send&token=#{@token}&lang=zh_CN"
+      res = RestClient.get(url, cookies: @cookies)
       day_msg_count = 0
-      msg_count_reg = /.*mass_send_left\s*:\s*can_verify_apply\s*\?\s*\'(\d*)\'\*/
-      if msg_count_reg =~ res.to_s
-        day_msg_count = $1
-      end
+      reg = /.*mass_send_left\s*:\s*can_verify_apply\s*\?\s*\'(\d*)\'\*/
+      day_msg_count = $1 if reg =~ res.to_s
       day_msg_count.to_i
     end
 
-    # todo list
-    # 获取 last_msg_id 和 fake_id
-    def get_ids # 未完成
-      url = "https://mp.weixin.qq.com/cgi-bin/message?t=message/list&count=20&day=7&token=#{@token}&lang=zh_CN"
+    # 获取 last_msg_id 和 msg_item
+    def get_msg_item
+      url = 'https://mp.weixin.qq.com/cgi-bin/message?t=message/list&count=20'\
+            "&day=7&token=#{@token}&lang=zh_CN"
       resource = RestClient::Resource.new(url, cookies: @cookies)
       res = resource.get
-      doc = Nokogiri::HTML(res.to_s)
-      doc.css('ul.message_list li').each do |li|
-        puts li.content
+      reg = /.*total_count\s*:\s*(\d*).*latest_msg_id\s*:\s*\'(\d*)\'.*list\s*:\s*\((.*)\)\.msg_item,.*/m
+      return_hash = {
+        status: -1,
+        msg: 'system_error'
+      }
+      if reg =~ res.to_s
+        return_hash = {
+          status: 0,
+          msg: 'ok',
+          total_count: $1,
+          latest_msg_id: $2,
+          msg_item: JSON.parse($3)['msg_item']
+        }
       end
+      return_hash
     end
 
 		# https://mp.weixin.qq.com/cgi-bin/message?t=message/list&token=1664040225&count=20&day=7
@@ -208,19 +246,21 @@ module WxExt
     end
 
     private
+
     def set_cookie(page, k, v)
       case Capybara.current_session.driver
       when Capybara::Poltergeist::Driver
-        page.driver.set_cookie(k,v)
+        page.driver.set_cookie(k, v)
       when Capybara::RackTest::Driver
         headers = {}
-        Rack::Utils.set_cookie_header!(headers,k,v)
+        Rack::Utils.set_cookie_header!(headers, k, v)
         cookie_string = headers['Set-Cookie']
         Capybara.current_session.driver.browser.set_cookie(cookie_string)
       when Capybara::Selenium::Driver
-        page.driver.browser.manage.add_cookie(:name=>k, :value=>v)
+        page.driver.browser.manage.add_cookie(name: k, value: v)
       else
-        raise "no cookie-setter implemented for driver #{Capybara.current_session.driver.class.name}"
+        fail 'no cookie-setter implemented for driver '\
+              "#{Capybara.current_session.driver.class.name}"
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'bundler/setup'
 Bundler.setup
 
@@ -5,4 +6,4 @@ require 'wx_ext'
 
 RSpec.configure do |config|
   #
-end
+end

data/spec/wx_ext/weixin_spec.rb

@@ -3,10 +3,16 @@ require 'spec_helper'
 
 describe WxExt::WeiXin do
   before(:all) do
-    @weixin = WxExt::WeiXin.new 'flowerwrong@hotmail.com', '1*flower@wrong*1'
+    @weixin = WxExt::WeiXin.new 'flowerwrong', '11111111'
   end
 
-  it 'init method should init all params' do
+  it 'should login to the mp' do
+    res_hash = @weixin.login
+    expect(res_hash[:status]).to eql(0)
+  end
+
+  it 'should init method should init all params' do
+    res_hash = @weixin.login
     flag = @weixin.init
     if flag
       token = @weixin.token
@@ -15,29 +21,36 @@ describe WxExt::WeiXin do
     end
   end
 
-  it 'should get day msg count' do
-    flag = @weixin.init
-    if flag
-      day_msg_count = @weixin.get_day_msg_count
-      expect(day_msg_count.to_s).to match(/\d*/)
-    end
-  end
-
-  # 未完待续
   it 'should get fakeids and msg ids' do
+    res_hash = @weixin.login
     flag = @weixin.init
-    res = @weixin.get_ids if flag
-    puts res.to_s
+    res_hash = @weixin.get_msg_item if flag
+    puts '==' * 20
+    puts res_hash
+    expect(res_hash[:status]).to eql(0)
   end
 
   it "should get new msg num" do
+    res_hash = @weixin.login
     flag = @weixin.init
-    res_hash = @weixin.get_new_msg_num('201004139')
+    msg_res_hash = @weixin.get_msg_item if flag
+    res_hash = @weixin.get_new_msg_num(msg_res_hash[:latest_msg_id=])
+    puts '==' * 20
     puts res_hash
     expect(res_hash['ret'].to_s).to eql('0')
   end
 
+  it 'should get day msg count' do
+    res_hash = @weixin.login
+    flag = @weixin.init
+    if flag
+      day_msg_count = @weixin.get_day_msg_count
+      expect(day_msg_count.to_s).to match(/\d*/)
+    end
+  end
+
   it "should get contact info" do
+    res_hash = @weixin.login
     flag = @weixin.init
     res_hash = @weixin.get_contact_info('204060720')
     puts res_hash
@@ -45,13 +58,15 @@ describe WxExt::WeiXin do
   end
 
   it "should return a country list" do
+    res_hash = @weixin.login
     flag = @weixin.init
     res_hash = @weixin.get_country_list
     puts res_hash
     expect(res_hash["num"].to_s).to match(/\d+/)
   end
 
-  it "upload_file method should return a right hash" do
+  it 'should upload_file method should return a right hash' do
+    res_hash = @weixin.login
     flag = @weixin.init
     puts @weixin.token
     puts @weixin.ticket_id
@@ -63,7 +78,8 @@ describe WxExt::WeiXin do
     expect(file_hash["base_resp"]["ret"].to_s).to eql("0")
   end
 
-  it "upload_single_msg method should upload a msg to sucaizhongxin" do
+  it "should upload_single_msg method should upload a msg to sucaizhongxin" do
+    res_hash = @weixin.login
     flag = @weixin.init
     file = File.new("/home/yang/dev/ruby/gem/hack_wx/spec/hack_wx/test_spec.jpg", 'rb')
     file_hash = @weixin.upload_file(file, "test_spec.jpg")
@@ -91,7 +107,8 @@ describe WxExt::WeiXin do
     expect(msg_hash["ret"].to_s).to eql("0")
   end
 
-  it "upload_multi_msg method should upload multi msg to sucaizhongxin" do
+  it "should upload_multi_msg method should upload multi msg to sucaizhongxin" do
+    res_hash = @weixin.login
     flag = @weixin.init
     file = File.new("/home/yang/dev/ruby/gem/hack_wx/spec/hack_wx/test_spec.jpg", 'rb')
     file_hash = @weixin.upload_file(file, "test_spec.jpg")
@@ -126,7 +143,8 @@ describe WxExt::WeiXin do
     expect(msg_hash["ret"].to_s).to eql("0")
   end
 
-  it "broadcast msg to all user should return ok" do
+  it "should broadcast msg to all user" do
+    res_hash = @weixin.login
     flag = @weixin.init
 
     msg_hash = @weixin.get_app_msg_list
@@ -135,8 +153,8 @@ describe WxExt::WeiXin do
 
     msg_params = {
         ajax: 1,
-        appmsgid: app_msg_id, # 图文appid
-        cardlimit: 1, # 发送限制条数
+        appmsgid: app_msg_id,
+        cardlimit: 1,
         city: '',
         country: '',
         province: '',
@@ -144,7 +162,7 @@ describe WxExt::WeiXin do
         groupid: '-1',
         imgcode: '',
         lang: 'zh_CN',
-        operation_seq: @weixin.operation_seq, #
+        operation_seq: @weixin.operation_seq,
         random: rand,
         sex: 0,
         synctxweibo: 0,
@@ -158,7 +176,8 @@ describe WxExt::WeiXin do
     expect(msg_hash["ret"].to_s).to eql("0")
   end
 
-  it "get app msg list return json" do
+  it 'should get app msg list with json' do
+    res_hash = @weixin.login
     flag = @weixin.init
 
     msg_hash = @weixin.get_app_msg_list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - flowerwrong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler