wechat-bot 0.1.0.alpha → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '090643c6759e35fa619b81b30055aa05e001d4fe'
-  data.tar.gz: 58a2fd57bc3967c6c552de30201e357968eec9a5
+SHA256:
+  metadata.gz: f51d686f64f0e38fe8db34c7b9bae5e6de249fc02ebcf98d4ddd4f94a96a342e
+  data.tar.gz: 9fffa5e215ce50566f1287ad2e38eed4b19bd0c9b5134ef4cca87c6df4d8fd1f
 SHA512:
-  metadata.gz: 3b804920918ea5ddac3efb46183af8b0d1bae54d227c83f74f175d4bf907bb93286848ae10f70a497f7736ede1f98fe00902ad71765a22f52597e764d30db352
-  data.tar.gz: 8c2e0e348f2425a3542c4bd5fe317cd99167cfb1765a66338619b5f3d43a132ea7d86c48cfd059c54aa1b0e0879fc1cbd0d039c2ead6cddb1557694ae3546389
+  metadata.gz: 2f82d691486b461ebff9b0804e1cb6955f4b8f91f4ec96d10a664639776acc549daa328c58f92ff44ca004bd33afc4c682b631f379b106c57e039f074bebe268
+  data.tar.gz: 190fb8b8331da512d2ce7771193ccb7ab703d7b12c61c979d2436778e5b425796b39d3eee580665009600daf18ee5a161d41169b9b5fa054ffde0b46930f8353

data/.circleci/config.yml

@@ -0,0 +1,13 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.4.1
+    branches:
+      ignore:
+        - gh-pages
+    working_directory: ~/wechat-bot
+    steps:
+      - checkout
+      - run: bundle install
+      - run: rake spec

data/.gitignore

@@ -13,3 +13,4 @@
 # rspec failure tracking
 .rspec_status
 .rvmrc
+.vscode

data/.rubocop.yml

@@ -12,3 +12,6 @@ Style/AsciiComments:
 
 Style/SpecialGlobalVars:
   Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false

data/.ruby-gemset

@@ -1 +1 @@
-wecaht-bot
+wechat-bot

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.0

data/README.md

@@ -1,6 +1,6 @@
 # wechat-bot
 
-[![Build Status](https://img.shields.io/travis/icyleaf/wechat-bot.svg?style=flat)](https://travis-ci.org/icyleaf/wechat-bot)
+[![Build Status](https://img.shields.io/circleci/project/github/icyleaf/wechat-bot.svg?style=flat)](https://circleci.com/gh/icyleaf/wechat-bot)
 [![Code Climate](https://img.shields.io/codeclimate/github/icyleaf/wechat-bot.svg?style=flat)](https://codeclimate.com/github/icyleaf/wechat-bot)
 [![Inline docs](http://inch-ci.org/github/icyleaf/wechat-bot.svg?style=flat)](https://inch-ci.org/github/icyleaf/wechat-bot)
 [![Gem version](https://img.shields.io/gem/v/wechat-bot.svg?style=flat)](https://rubygems.org/gems/wechat-bot)
@@ -13,7 +13,7 @@
 ```ruby
 require 'wechat-bot'
 
-bot = Wechat::Bot::Client.new do
+bot = Wechat::Bot.new do
   on :message, "ping" do |message|
     message.reply "PONG"
   end

data/Rakefile

@@ -1,12 +1,14 @@
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
 require 'wechat_bot'
 require 'awesome_print'
 
+require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
+task :default => [:rubocop, :spec]
 
 desc 'Run a sample wechat bot'
 task :bot do
@@ -25,7 +27,7 @@ task :bot do
         else
           m.reply m.media_id, type: :emoticon
         end
-      when WeChat::Bot::Message::Kind::ShareLink
+      when WeChat::Bot::Message::Kind::ShareCard
         m.reply "标题：#{m.meta_data.title}\n描述：#{m.meta_data.description}\n#{m.meta_data.link}"
       when WeChat::Bot::Message::Kind::System
         m.reply "系统消息：#{m.message}"

data/lib/wechat-bot.rb

@@ -1 +1,3 @@
-require "wechat/bot"
+# frozen_string_literal: true
+
+require 'wechat/bot'

data/lib/wechat/bot.rb

@@ -1,11 +1,13 @@
-require "wechat/bot/ext/wechat_emoji_string"
-
+require "wechat/bot/version"
 require "wechat/bot/core"
 require "wechat/bot/client"
-require "wechat/bot/version"
+require "wechat/bot/exception"
+require "wechat/bot/ext/wechat_emoji_string"
 
-module WeChat::Bot
-  def self.new(&block)
-    WeChat::Bot::Core.new(&block)
+module WeChat
+  module Bot
+    def self.new(&block)
+      WeChat::Bot::Core.new(&block)
+    end
   end
 end

data/lib/wechat/bot/client.rb

@@ -111,7 +111,7 @@ module WeChat::Bot
     end
 
     # 获取二维码图片
-    def show_qr_code(uuid, renderer = "ansi")
+    def show_qr_code(uuid)
       @bot.logger.info "获取登录用扫描二维码 ... "
       url = File.join(@bot.config.auth_url, "l", uuid)
       qrcode = RQRCode::QRCode.new(url)
@@ -153,11 +153,11 @@ module WeChat::Bot
       r = @session.get(File.join(@bot.config.auth_url, "cgi-bin/mmwebwx-bin/login"), params: params)
       data = r.parse(:js)
       status = case data["code"]
-      when 200 then :logged
-      when 201 then :scaned
-      when 408 then :waiting
-      else          :timeout
-      end
+               when 200 then :logged
+               when 201 then :scaned
+               when 408 then :waiting
+               else          :timeout
+               end
 
       [status, data]
     end
@@ -559,7 +559,7 @@ module WeChat::Bot
     #
     # @return [void]
     def params_sync_key
-      store(:sync_key)["List"].map {|i| i.values.join("_") }.join("|")
+      store(:sync_key)["List"].map { |i| i.values.join("_") }.join("|")
     end
 
     # 初始化变量

data/lib/wechat/bot/configuration.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module WeChat::Bot
   class Configuration < OpenStruct
     # 默认配置
@@ -10,36 +12,36 @@ module WeChat::Bot
         fireman: 'filehelper',
 
         # WeChat Configurations
-        app_id: "wx782c26e4c19acffb",
-        auth_url: "https://login.weixin.qq.com",
+        app_id: 'wx782c26e4c19acffb',
+        auth_url: 'https://login.weixin.qq.com',
         servers: [
           {
-            index: "wx.qq.com",
-            file: "file.wx.qq.com",
-            push: "webpush.wx.qq.com",
+            index: 'wx.qq.com',
+            file: 'file.wx.qq.com',
+            push: 'webpush.wx.qq.com',
           },
           {
-            index: "wx2.qq.com",
-            file: "file.wx2.qq.com",
-            push: "webpush.wx2.qq.com",
+            index: 'wx2.qq.com',
+            file: 'file.wx2.qq.com',
+            push: 'webpush.wx2.qq.com',
           },
           {
-            index: "wx8.qq.com",
-            file: "file.wx8.qq.com",
-            push: "webpush.wx8.qq.com",
+            index: 'wx8.qq.com',
+            file: 'file.wx8.qq.com',
+            push: 'webpush.wx8.qq.com',
           },
           {
-            index: "wechat.com",
-            file: "file.web.wechat.com",
-            push: "webpush.web.wechat.com",
+            index: 'wechat.com',
+            file: 'file.web.wechat.com',
+            push: 'webpush.web.wechat.com',
           },
           {
-            index: "web2.wechat.com",
-            file: "file.web2.wechat.com",
-            push: "webpush.web2.wechat.com",
+            index: 'web2.wechat.com',
+            file: 'file.web2.wechat.com',
+            push: 'webpush.web2.wechat.com',
           },
         ],
-        cookies: "wechat-bot-cookies.txt",
+        cookies: 'wechat-bot-cookies.txt',
         special_users: [
           'newsapp', 'filehelper', 'weibo', 'qqmail',
           'fmessage', 'tmessage', 'qmessage', 'qqsync',
@@ -51,7 +53,7 @@ module WeChat::Bot
           'notification_messages', 'wxid_novlwrv3lqwv11',
           'gh_22b87fa7cb3c', 'userexperience_alarm',
         ],
-        user_agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
+        user_agent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36',
       }
     end
 

data/lib/wechat/bot/contact.rb

@@ -133,7 +133,7 @@ module WeChat::Bot
 
       # 满足群组类型且 nickname 为空时补充一个默认的群组名（参考微信 App 设计）
       if attribute.to_sym == :nickname && value.to_s.empty? && @kind == Kind::Group
-        value = members.map {|m| m.nickname }.join("、")
+        value = members.map { |m| m.nickname }.join("、")
       end
 
       if data

data/lib/wechat/bot/core.rb

@@ -126,7 +126,7 @@ module WeChat::Bot
       @client.logout if @client.logged? && @client.alive?
     end
 
-    private
+    # private
 
     # def defaults_logger
     #   @logger = Logger.new($stdout)

data/lib/wechat/bot/exception.rb

@@ -0,0 +1,5 @@
+module WeChat::Bot
+  class Exception < StandardError; end
+
+  class NoReplyException < Exception; end
+end

data/lib/wechat/bot/http/adapter/js.rb

@@ -9,7 +9,7 @@ module WeChat::Bot
       # 提示：不可逆转
       class JS < ::HTTP::MimeType::Adapter
         # Encodes object to js
-        def encode(obj)
+        def encode(_)
           "" # NO NEED encode
         end
 

data/lib/wechat/bot/http/adapter/xml.rb

@@ -10,7 +10,7 @@ module WeChat::Bot
       # 提示：不可逆转
       class XML < ::HTTP::MimeType::Adapter
         # Encodes object to js
-        def encode(obj)
+        def encode(_)
           "" # NO NEED encode
         end
 

data/lib/wechat/bot/logger.rb

@@ -42,7 +42,7 @@ module WeChat::Bot
 
     def fatal(exception)
       message = ["#{exception.backtrace.first}: #{exception.message} (#{exception.class})"]
-      message.concat exception.backtrace[1..-1].map {|s| "\t" + s}
+      message.concat(exception.backtrace[1..-1].map {|s| "\t" + s})
       log(:fatal, message.join("\n"))
     end
 

data/lib/wechat/bot/message.rb

@@ -1,4 +1,4 @@
-require "wechat/bot/message_data/share_link"
+require "wechat/bot/message_data/share_card"
 
 module WeChat::Bot
   # 微信消息
@@ -10,10 +10,11 @@ module WeChat::Bot
       Voice = :voice
       ShortVideo = :short_video
       Emoticon = :emoticon
-      ShareLink = :share_link
+      ShareCard = :share_link
       # RedPacage = :red_package
       # BusinessCard = :business_card
       # MusicLink = :music_link
+      Verify = :verify
       System = :system
       Unkown = :unkown
     end
@@ -67,7 +68,7 @@ module WeChat::Bot
 
       parse
 
-      @bot.logger.debug "Message Raw: #{@raw}"
+      @bot.logger.verbose "Message Raw: #{@raw}"
     end
 
     # 回复消息
@@ -76,6 +77,12 @@ module WeChat::Bot
       to_user = @bot.contact_list.find(nickname: args[:nickname]) if args[:nickname]
 
       message_type = args[:type] || :text
+
+      # if @bot.config.special_users.include?(to_user) && to_user != 'filehelper'
+      #   @bot.logger.error "特殊账户无法回复: #{to_user}"
+      #   raise NoReplyException, "特殊账户无法回复: #{to_user}"
+      # end
+
       @bot.client.send(message_type, to_user, text)
     end
 
@@ -89,17 +96,18 @@ module WeChat::Bot
       message = @raw["Content"].convert_emoji
       message = CGI.unescape_html(message) if @kinde != Message::Kind::Text
       if match = group_message(message)
-        from_username = match[0]
+        # from_username = match[0]
         message = match[1]
       end
 
       @message = message
+      # TODO: 来自于特殊账户无法获取联系人信息，需要单独处理
       @from = @bot.contact_list.find(username: @raw["FromUserName"])
       parse_emoticon if @kind == Message::Kind::Emoticon
 
       case @kind
-      when Message::Kind::ShareLink
-        @meta_data = MessageData::ShareLink.parse(@message)
+      when Message::Kind::ShareCard
+        @meta_data = MessageData::ShareCard.parse(@message)
       end
 
       parse_events
@@ -129,6 +137,10 @@ module WeChat::Bot
       @message.match(regexp)
     end
 
+    def at_message?
+      @at_mesage == true
+    end
+
     # 解析消息来源
     #
     # 特殊账户/群聊/公众号/用户
@@ -155,9 +167,10 @@ module WeChat::Bot
     #  - 1: Text 文本消息
     #  - 3: Image 图片消息
     #  - 34: Voice 语言消息
+    #  - 37: 验证消息
     #  - 42: BusinessCard 名片消息
     #  - 47: Emoticon 微信表情
-    #  - 49: ShareLink 分享链接消息
+    #  - 49: ShareCard 分享链接消息
     #  - 62: ShortVideo 短视频消息
     #  - 1000: System 系统消息
     #  - Unkown 未知消息
@@ -171,6 +184,8 @@ module WeChat::Bot
                 Message::Kind::Image
               when 34
                 Message::Kind::Voice
+              when 37
+                Message::Kind::Verify
               when 42
                 Message::Kind::BusinessCard
               when 62
@@ -178,7 +193,7 @@ module WeChat::Bot
               when 47
                 Message::Kind::Emoticon
               when 49
-                Message::Kind::ShareLink
+                Message::Kind::ShareCard
               when 10000
                 Message::Kind::System
               else
@@ -190,6 +205,9 @@ module WeChat::Bot
     #
     #  - `:message` 用户消息
     #    - `:text` 文本消息
+    #    - `:image` 图片消息
+    #    - `:voice` 语音消息
+    #    - `:short_video` 短视频消息
     #  - `:group` 群聊消息
     #    - `:at_message` @ 消息
     #
@@ -199,8 +217,10 @@ module WeChat::Bot
       @events << @kind
       @events << @source
 
+      @at_mesage = false
       if @source == :group && @raw["Content"] =~ /@([^\s]+)\s+(.*)/
         @events << :at_message
+        @at_mesage = true
       end
     end
 
@@ -223,8 +243,8 @@ module WeChat::Bot
     end
 
     def parse_share
+      # TODO: 完成解析
       data = MultiXml.parse(@message)
-
     end
 
     # 解析用户的群消息

data/lib/wechat/bot/message_data/{share_link.rb → share_card.rb}

@@ -1,5 +1,5 @@
 module WeChat::Bot::MessageData
-  class ShareLink
+  class ShareCard
     def self.parse(raw)
       self.new(raw)
     end

data/lib/wechat/bot/version.rb

@@ -1,5 +1,5 @@
 module WeChat
   module Bot
-    VERSION = "0.1.0.alpha"
+    VERSION = '0.1.3'.freeze
   end
 end

data/lib/wechat_bot.rb

@@ -1 +1,3 @@
-require "wechat/bot"
+# frozen_string_literal: true
+
+require 'wechat/bot'

data/wechat-bot.gemspec

@@ -21,9 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.1.0"
+
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop", "~> 0.53.0"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "awesome_print"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat-bot
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.1.3
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.53.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -143,13 +157,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
-- ".vscode/launch.json"
 - ".yardopts"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -165,16 +178,16 @@ files:
 - lib/wechat/bot/contact.rb
 - lib/wechat/bot/contact_list.rb
 - lib/wechat/bot/core.rb
+- lib/wechat/bot/exception.rb
 - lib/wechat/bot/ext/wechat_emoji_string.rb
 - lib/wechat/bot/handler.rb
 - lib/wechat/bot/handler_list.rb
-- lib/wechat/bot/helper.rb
 - lib/wechat/bot/http/adapter/js.rb
 - lib/wechat/bot/http/adapter/xml.rb
 - lib/wechat/bot/http/session.rb
 - lib/wechat/bot/logger.rb
 - lib/wechat/bot/message.rb
-- lib/wechat/bot/message_data/share_link.rb
+- lib/wechat/bot/message_data/share_card.rb
 - lib/wechat/bot/pattern.rb
 - lib/wechat/bot/version.rb
 - lib/wechat_bot.rb
@@ -191,15 +204,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: WeChat Bot for Ruby

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.0
-before_install: gem install bundler -v 1.14.6

data/.vscode/launch.json

@@ -1,65 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Rake",
-      "type": "Ruby",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/vendor/rake",
-      "useBundler": true,
-      "args": [
-        "bot"
-      ]
-    },
-    {
-      "name": "Listen for rdebug-ide",
-      "type": "Ruby",
-      "request": "attach",
-      "cwd": "${workspaceRoot}",
-      "remoteHost": "127.0.0.1",
-      "remotePort": "1234",
-      "remoteWorkspaceRoot": "${workspaceRoot}"
-    },
-    {
-      "name": "Rails server",
-      "type": "Ruby",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/bin/rails",
-      "args": [
-        "server"
-      ]
-    },
-    {
-      "name": "RSpec - all",
-      "type": "Ruby",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/bin/rspec",
-      "args": [
-        "-I",
-        "${workspaceRoot}"
-      ]
-    },
-    {
-      "name": "RSpec - active spec file only",
-      "type": "Ruby",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/bin/rspec",
-      "args": [
-        "-I",
-        "${workspaceRoot}",
-        "${file}"
-      ]
-    },
-    {
-      "name": "Cucumber",
-      "type": "Ruby",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/bin/cucumber"
-    }
-  ]
-}

data/lib/wechat/bot/helper.rb

@@ -1,2 +0,0 @@
-module WeChat::Bot
-end